增加分院类型,管理后台做权限管理

FFIB 4 lat temu
rodzic
commit
4c66fe6eb3

+ 18 - 0
account/migrations/0004_auto_20210303_1818.py

@@ -0,0 +1,18 @@
1
+# Generated by Django 2.2.15 on 2021-03-03 10:18
2
+
3
+from django.db import migrations, models
4
+
5
+
6
+class Migration(migrations.Migration):
7
+
8
+    dependencies = [
9
+        ('account', '0003_auto_20210303_1623'),
10
+    ]
11
+
12
+    operations = [
13
+        migrations.AlterField(
14
+            model_name='userinfo',
15
+            name='status',
16
+            field=models.BooleanField(db_index=True, default=True, help_text='Status', verbose_name='status'),
17
+        ),
18
+    ]

+ 53 - 0
registration/migrations/0010_auto_20210303_1818.py

@@ -0,0 +1,53 @@
1
+# Generated by Django 2.2.15 on 2021-03-03 10:18
2
+
3
+from django.db import migrations, models
4
+
5
+
6
+class Migration(migrations.Migration):
7
+
8
+    dependencies = [
9
+        ('registration', '0009_auto_20210303_1623'),
10
+    ]
11
+
12
+    operations = [
13
+        migrations.AddField(
14
+            model_name='branchcampusinfo',
15
+            name='campus_type',
16
+            field=models.IntegerField(choices=[(0, '总院'), (1, '分院')], db_index=True, default=1, help_text='学院类型', verbose_name='campus_type'),
17
+        ),
18
+        migrations.AlterField(
19
+            model_name='branchcampusadministratorinfo',
20
+            name='status',
21
+            field=models.BooleanField(db_index=True, default=True, help_text='Status', verbose_name='status'),
22
+        ),
23
+        migrations.AlterField(
24
+            model_name='branchcampusinfo',
25
+            name='status',
26
+            field=models.BooleanField(db_index=True, default=True, help_text='Status', verbose_name='status'),
27
+        ),
28
+        migrations.AlterField(
29
+            model_name='courseinfo',
30
+            name='status',
31
+            field=models.BooleanField(db_index=True, default=True, help_text='Status', verbose_name='status'),
32
+        ),
33
+        migrations.AlterField(
34
+            model_name='courseregisterfieldinfo',
35
+            name='status',
36
+            field=models.BooleanField(db_index=True, default=True, help_text='Status', verbose_name='status'),
37
+        ),
38
+        migrations.AlterField(
39
+            model_name='courseregisterfieldpoolinfo',
40
+            name='status',
41
+            field=models.BooleanField(db_index=True, default=True, help_text='Status', verbose_name='status'),
42
+        ),
43
+        migrations.AlterField(
44
+            model_name='courseregisterinfo',
45
+            name='status',
46
+            field=models.BooleanField(db_index=True, default=True, help_text='Status', verbose_name='status'),
47
+        ),
48
+        migrations.AlterField(
49
+            model_name='usercourseregisterinfo',
50
+            name='status',
51
+            field=models.BooleanField(db_index=True, default=True, help_text='Status', verbose_name='status'),
52
+        ),
53
+    ]

+ 12 - 0
registration/models.py

@@ -10,8 +10,16 @@ from api.wx_views import get_course_field_limit_scene_qrcode_url
10 10
 
11 11
 
12 12
 class BranchCampusInfo(BaseModelMixin):
13
+    MAIN = 0
14
+    BRANCH = 1
15
+
16
+    CAMPUS_TYPE = (
17
+        (MAIN, '总院'),
18
+        (BRANCH, '分院'),
19
+    )
13 20
     campus_id = ShortUUIDField(_('campus_id'), max_length=32, blank=True, null=True, help_text='分院唯一标识', db_index=True, unique=True)
14 21
     campus_name = models.CharField(_('campus_name'), max_length=255, blank=True, null=True, help_text='分院名称')
22
+    campus_type = models.IntegerField(_('campus_type'), choices=CAMPUS_TYPE, default=BRANCH, help_text='学院类型', db_index=True)
15 23
 
16 24
     class Meta:
17 25
         verbose_name = _('分院信息')
@@ -25,6 +33,7 @@ class BranchCampusInfo(BaseModelMixin):
25 33
         return {
26 34
             'campus_id': self.campus_id,
27 35
             'campus_name': self.campus_name,
36
+            'campus_type': self.campus_type,
28 37
         }
29 38
 
30 39
 
@@ -63,11 +72,14 @@ class BranchCampusAdministratorInfo(BaseModelMixin):
63 72
 
64 73
     @property
65 74
     def data(self):
75
+        admin = BranchCampusInfo.objects.get(campus_id=self.campus_id, status=True)
76
+
66 77
         return {
67 78
             'user_id': self.user_id,
68 79
             'admin_id': self.admin_id,
69 80
             'campus_id': self.campus_id,
70 81
             'campus_name': self.campus_name,
82
+            'campus_type': admin.campus_type,
71 83
             'name': self.name,
72 84
             'phone': self.phone,
73 85
             'user_status': self.user_status,